Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sun, 23 May 2010 11:52:45 +0000 (11:52 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sun, 23 May 2010 11:52:45 +0000 (11:52 +0000)
commitcda701209fddd5b86f1382fd6036ef33091d3d44
tree34e1f063e13d194aded74c9953f6d9cb103f2d6a
parent9f3d6cfb8910b5fce584fa33a59cbad40ce0a5af
parentdee238ce96a1d5be888ff0138296c34cf569b58d
Merge from mainline.